add ability to specify host and port for mysql

Gunnar Hellekson 11 years ago
parent
commit
284ff73199
2 changed files with 7 additions and 1 deletions
  1. 2 0
      .env.example
  2. 5 1
      config/database.yml

+ 2 - 0
.env.example

@@ -15,6 +15,8 @@ DATABASE_NAME=huginn_development
15 15
 DATABASE_POOL=5
16 16
 DATABASE_USERNAME=root
17 17
 DATABASE_PASSWORD=
18
+#DATABASE_HOST=your-domain-here.com
19
+#DATABASE_PORT=3306
18 20
 DATABASE_SOCKET=/tmp/mysql.sock
19 21
 
20 22
 # ==== Additional required production settings ====

+ 5 - 1
config/database.yml

@@ -6,6 +6,8 @@ development:
6 6
   pool: <%= ENV['DATABASE_POOL'] || "5" %>
7 7
   username: <%= ENV['DATABASE_USERNAME'] || "root" %>
8 8
   password: <%= ENV['DATABASE_PASSWORD'] || "" %>
9
+  host: <%= ENV['DATABASE_HOST'] || "" %>
10
+  port: <%= ENV['DATABASE_PORT'] || "" %>
9 11
   socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
10 12
 
11 13
 # Warning: The database defined as "test" will be erased and
@@ -29,4 +31,6 @@ production:
29 31
   pool: <%= ENV['DATABASE_POOL'] || "5" %>
30 32
   username: <%= ENV['DATABASE_USERNAME'] || "root" %>
31 33
   password: <%= ENV['DATABASE_PASSWORD'] || "password" %>
32
-  socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
34
+  host: <%= ENV['DATABASE_HOST'] || "" %>
35
+  port: <%= ENV['DATABASE_PORT'] || "" %>
36
+  socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>